Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Mon, 20 Jul 2015 21:12:52 +0000 (17:12 -0400)
committerTom Rini <[email protected]>
Mon, 20 Jul 2015 21:12:52 +0000 (17:12 -0400)

Trivial merge